• SPTableContent

- added at the end of [self loadTableValues] an alert if loading failed
• SPContentFilterManager
- removed any key bindings for hopefully getting rid of some "mutating method sent to immutable object"  exceptions/crashes [1479, 1372, 1310, 295, 1227, 692, 149]
- better handling of ESC to cancel the name in-cell editing in table
- improved validations
- some general code improvements
- added/changed comments

3 files changed, 551 insertions, 156 deletions

diff --git a/Interfaces/English.lproj/ContentFilterManager.xib b/Interfaces/English.lproj/ContentFilterManager.xib
index 0c6c417e..5aff83d8 100644
--- a/Interfaces/English.lproj/ContentFilterManager.xib
+++ b/Interfaces/English.lproj/ContentFilterManager.xib
@@ -3,7 +3,7 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">762</string>
+		<string key="IBDocument.InterfaceBuilderVersion">788</string>
 		<string key="IBDocument.AppKitVersion">1038.29</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -15,13 +15,13 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>762</string>
+				<string>788</string>
 				<string>1.2.5</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="280"/>
+			<integer value="14"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1100,22 +1100,6 @@
 					<int key="connectionID">306</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.MenuLabel</string>
-						<reference key="source" ref="247897226"/>
-						<reference key="destination" ref="863945469"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="247897226"/>
-							<reference key="NSDestination" ref="863945469"/>
-							<string key="NSLabel">value: selection.MenuLabel</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.MenuLabel</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">308</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">window</string>
 						<reference key="source" ref="1001"/>
@@ -2278,6 +2262,13 @@
 						<string key="NS.key.0">toggleCollapse:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">toggleCollapse:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">toggleCollapse:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">Source/TablesList.h</string>
@@ -2320,6 +2311,80 @@
 							<string>id</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>doDecomposedStringWithCanonicalMapping:</string>
+							<string>doDecomposedStringWithCompatibilityMapping:</string>
+							<string>doPrecomposedStringWithCanonicalMapping:</string>
+							<string>doPrecomposedStringWithCompatibilityMapping:</string>
+							<string>doRemoveDiacritics:</string>
+							<string>doSelectionLowerCase:</string>
+							<string>doSelectionTitleCase:</string>
+							<string>doSelectionUpperCase:</string>
+							<string>doTranspose:</string>
+							<string>insertNULLvalue:</string>
+							<string>selectCurrentLine:</string>
+							<string>selectCurrentWord:</string>
+							<string>selectEnclosingBrackets:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">doDecomposedStringWithCanonicalMapping:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doDecomposedStringWithCompatibilityMapping:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doPrecomposedStringWithCanonicalMapping:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doPrecomposedStringWithCompatibilityMapping:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doRemoveDiacritics:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doSelectionLowerCase:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doSelectionTitleCase:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doSelectionUpperCase:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doTranspose:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">insertNULLvalue:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">selectCurrentLine:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">selectCurrentWord:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">selectEnclosingBrackets:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">Source/SPTextViewAdditions.h</string>
@@ -2358,6 +2423,50 @@
 							<string>id</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addContentFilter:</string>
+							<string>closeContentFilterManagerSheet:</string>
+							<string>duplicateContentFilter:</string>
+							<string>exportContentFilter:</string>
+							<string>importContentFilterByAdding:</string>
+							<string>insertPlaceholder:</string>
+							<string>removeContentFilter:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">addContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">closeContentFilterManagerSheet:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">duplicateContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">exportContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">importContentFilterByAdding:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">insertPlaceholder:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">removeContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
@@ -2393,6 +2502,80 @@
 							<string>BWAnchoredButtonBar</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>contentFilterArrayController</string>
+							<string>contentFilterConjunctionLabel</string>
+							<string>contentFilterConjunctionTextField</string>
+							<string>contentFilterNameTextField</string>
+							<string>contentFilterTableView</string>
+							<string>contentFilterTextView</string>
+							<string>encodingPopUp</string>
+							<string>insertPlaceholderButton</string>
+							<string>numberOfArgsLabel</string>
+							<string>removeButton</string>
+							<string>resultingClauseContentLabel</string>
+							<string>resultingClauseLabel</string>
+							<string>splitViewButtonBar</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterArrayController</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterConjunctionLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterConjunctionTextField</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterNameTextField</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterTableView</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterTextView</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">encodingPopUp</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">insertPlaceholderButton</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">numberOfArgsLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">removeButton</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">resultingClauseContentLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">resultingClauseLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">splitViewButtonBar</string>
+								<string key="candidateClassName">BWAnchoredButtonBar</string>
+							</object>
+						</object>
+					</object>
 					<reference key="sourceIdentifier" ref="559035321"/>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -2410,10 +2593,24 @@
 						<string key="NS.key.0">showMySQLHelpForCurrentWord:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showMySQLHelpForCurrentWord:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showMySQLHelpForCurrentWord:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">scrollView</string>
 						<string key="NS.object.0">NSScrollView</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">scrollView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">scrollView</string>
+							<string key="candidateClassName">NSScrollView</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -2457,6 +2654,55 @@
 							<string>id</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addContentFilter:</string>
+							<string>closeContentFilterManagerSheet:</string>
+							<string>duplicateContentFilter:</string>
+							<string>exportContentFilter:</string>
+							<string>importContentFilterByAdding:</string>
+							<string>insertPlaceholder:</string>
+							<string>removeContentFilter:</string>
+							<string>suppressLeadingFiledPlaceholderWasChanged:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">addContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">closeContentFilterManagerSheet:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">duplicateContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">exportContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">importContentFilterByAdding:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">insertPlaceholder:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">removeContentFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">suppressLeadingFiledPlaceholderWasChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
@@ -2494,6 +2740,85 @@
 							<string>id</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>contentFilterArrayController</string>
+							<string>contentFilterConjunctionLabel</string>
+							<string>contentFilterConjunctionTextField</string>
+							<string>contentFilterNameTextField</string>
+							<string>contentFilterTableView</string>
+							<string>contentFilterTextView</string>
+							<string>encodingPopUp</string>
+							<string>insertPlaceholderButton</string>
+							<string>numberOfArgsLabel</string>
+							<string>removeButton</string>
+							<string>resultingClauseContentLabel</string>
+							<string>resultingClauseLabel</string>
+							<string>splitViewButtonBar</string>
+							<string>suppressLeadingFiledPlaceholderCheckbox</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterArrayController</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterConjunctionLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterConjunctionTextField</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterNameTextField</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterTableView</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentFilterTextView</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">encodingPopUp</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">insertPlaceholderButton</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">numberOfArgsLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">removeButton</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">resultingClauseContentLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">resultingClauseLabel</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">splitViewButtonBar</string>
+								<string key="candidateClassName">BWAnchoredButtonBar</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">suppressLeadingFiledPlaceholderCheckbox</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
 					<reference key="sourceIdentifier" ref="554460013"/>
 				</object>
 			</object>
@@ -3149,6 +3474,13 @@
 						<string key="NS.key.0">showWindow:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index 767065d5..a3f95fa2 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -33,11 +33,10 @@
 
 #define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]")
 #define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"[no selection]")
+#define SP_NAME_REQUIRED_PLACEHOLDER_STRING NSLocalizedString(@"[name required]", @"[name required]")
 
 @interface SPContentFilterManager (PrivateAPI)
 
-- (void)_initWithNoSelection;
-
 @end
 
 @implementation SPContentFilterManager
@@ -79,18 +78,8 @@
  */
 - (void)awakeFromNib
 {
-	[contentFilterTextView setAllowsDocumentBackgroundColorChange:YES];
-
-	NSMutableDictionary *bindingOptions = [NSMutableDictionary dictionary];
-
-	[bindingOptions setObject:NSUnarchiveFromDataTransformerName forKey:@"NSValueTransformerName"];
-
-	[contentFilterTextView bind:@"backgroundColor"
-					   toObject:[NSUserDefaultsController sharedUserDefaultsController]
-					withKeyPath:@"values.CustomQueryEditorBackgroundColor"
-						options:bindingOptions];
-
 
+	// Add global group row to contentFilters
 	[contentFilters addObject:[NSDictionary dictionaryWithObjectsAndKeys:
 			@"Global", @"MenuLabel",
 			@"", @"headerOfFileURL",
@@ -130,7 +119,12 @@
 			break;
 
 	[[self window] makeFirstResponder:contentFilterTableView];
-	[self _initWithNoSelection];
+
+	// Init GUI elements
+	[contentFilterTableView selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO];
+	[[contentFilterNameTextField cell] setPlaceholderString:SP_NO_SELECTION_PLACEHOLDER_STRING];
+	[contentFilterNameTextField setStringValue:@""];
+	[contentFilterTextView setString:@""];
 
 	// Register drag types
 	[contentFilterTableView registerForDraggedTypes:[NSArray arrayWithObject:SPContentFilterPasteboardDragType]];
@@ -153,7 +147,8 @@
 
 /**
  * Returns the content filters array for fileURL.
- * fileURL == nil → global content filters
+ * 
+ * @param fileURL == The SPDatabaseDocument file URL; if fileURL == nil return the global content filters
  */
 - (NSMutableArray *)contentFilterForFileURL:(NSURL *)fileURL
 {
@@ -293,13 +288,16 @@
 }
 
 /**
- * Insert placeholder - the placeholder string is stored as tooltip
+ * Insert placeholder - the to be inserted placeholder string is stored in sender's tooltip
  */
 - (IBAction)insertPlaceholder:(id)sender
 {
 	[contentFilterTextView insertText:[[[sender selectedItem] toolTip] substringToIndex:[[[sender selectedItem] toolTip] rangeOfString:@" – "].location]];
 }
 
+/**
+ * Show save panel sheet for exporting content filters to disk
+ */
 - (IBAction)exportContentFilter:(id)sender
 {
 	NSSavePanel *panel = [NSSavePanel savePanel];
@@ -314,6 +312,9 @@
 	[panel beginSheetForDirectory:nil file:nil modalForWindow:[self window] modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:@"exportFilter"];
 }
 
+/**
+ * Show open panel sheet for importing content filters by adding them to current ones
+ */
 - (IBAction)importContentFilterByAdding:(id)sender
 {
 	NSOpenPanel *panel = [NSOpenPanel openPanel];
@@ -332,6 +333,9 @@
 					contextInfo:NULL];
 }
 
+/**
+ * Show open panel sheet for importing content filters by replacing the current ones. Not yet implemented
+ */
 - (IBAction)importFavoritesByReplacing:(id)sender
 {
 
@@ -343,13 +347,6 @@
 - (IBAction)closeContentFilterManagerSheet:(id)sender
 {
 
-	// First check for ESC if pressed while inline editing
-	if(![sender tag] && isTableCellEditing) {
-		[contentFilterTableView abortEditing];
-		isTableCellEditing = NO;
-		return;
-	}
-
 	[NSApp endSheet:[self window] returnCode:0];
 	[[self window] orderOut:self];
 
@@ -381,6 +378,15 @@
 
 }
 
+/**
+ * It triggers an update of contentFilterTextView and 
+ * resultingClauseContentLabel by inserting @"" into contentFilterTextView
+ */
+- (IBAction)suppressLeadingFiledPlaceholderWasChanged:(id)sender
+{
+	[contentFilterTextView insertText:@""];
+}
+
 #pragma mark -
 #pragma mark SplitView delegate methods
 
@@ -401,7 +407,21 @@
 }
 
 #pragma mark -
-#pragma mark TableView datasource methods
+#pragma mark TableView delegate methods
+
+/**
+ * Update contentFilterNameTextField if selection of contentFilterTableView was changed.
+ */
+- (void)tableViewSelectionDidChange:(NSNotification *)aNotification
+{
+	if([contentFilterTableView selectedRow] > -1) {
+		NSString *newName = [[contentFilters objectAtIndex:[contentFilterTableView selectedRow]] objectForKey:@"MenuLabel"];
+		if(newName)
+			[contentFilterNameTextField setStringValue:newName];
+		else
+			[contentFilterNameTextField setStringValue:@""];
+	}
+}
 
 /**
  * Returns the number of all content filters.
@@ -494,7 +514,7 @@
 }
 
 /**
- * Sorting by clicking at a column header inside groups
+ * Sorting by clicking at a column header inside groups. Not yet implemented
  */
 - (void)tableView:(NSTableView*)tableView didClickTableColumn:(NSTableColumn *)tableColumn
 {
@@ -503,111 +523,12 @@
 }
 
 /**
- * contentFilters holds the data if a table row is a group header or not
+ * If current row's contentFilters object has a key "headerOfFileURL" then row is grouped ie it's an header
  */
 - (BOOL)tableView:(NSTableView *)aTableView isGroupRow:(NSInteger)rowIndex
 {
 	return ([[contentFilters objectAtIndex:rowIndex] objectForKey:@"headerOfFileURL"]) ? YES : NO;
 }
-/**
- * Detect if inline editing was done - then ESC to close the sheet will be activate
- */
-- (void)controlTextDidEndEditing:(NSNotification *)aNotification
-{
-	isTableCellEditing = NO;
-}
-
-/**
- * Changes in the name text field will be saved in data source directly
- * to update the table view accordingly
- */
-- (void)controlTextDidChange:(NSNotification *)notification
-{
-
-	// Do nothing if no filter is selected
-	if([contentFilterTableView numberOfSelectedRows] < 1) return;
-
-	id object = [notification object];
-
-	if(object == contentFilterNameTextField) {
-		[[contentFilters objectAtIndex:[contentFilterTableView selectedRow]] setObject:[contentFilterNameTextField stringValue] forKey:@"MenuLabel"];
-		[contentFilterTableView reloadData];
-	}
-
-}
-
-- (IBAction)suppressLeadingFiledPlaceholderWasChanged:(id)sender
-{
-	[contentFilterTextView insertText:@""];
-}
-
-/**
- * Parse clause and update labels accordingly
- */
-- (void)textViewDidChangeSelection:(NSNotification *)notification
-{
-	// Do nothing if no filter is selected
-	if([contentFilterTableView numberOfSelectedRows] < 1) return;
-
-	id object = [notification object];
-
-	if(object == contentFilterTextView) {
-		[insertPlaceholderButton setEnabled:([[contentFilterTextView string] length])];
-		[resultingClauseLabel setHidden:(![[contentFilterTextView string] length])];
-		[resultingClauseContentLabel setHidden:(![[contentFilterTextView string] length])];
-		[numberOfArgsLabel setHidden:(![[contentFilterTextView string] length])];
-
-		NSUInteger numOfArgs = [[[contentFilterTextView string] componentsMatchedByRegex:@"(?<!\\\\)(\\$\\{.*?\\})"] count];
-		[numberOfArgsLabel setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Number of arguments: %lu", @"Number of arguments: %lu"), (unsigned long)numOfArgs]];
-
-		[contentFilterConjunctionTextField setHidden:(numOfArgs < 2)];
-		[contentFilterConjunctionLabel setHidden:(numOfArgs < 2)];
-
-		if(numOfArgs > 2) {
-			[resultingClauseLabel setStringValue:NSLocalizedString(@"Error", @"error")];
-			[resultingClauseContentLabel setStringValue:NSLocalizedString(@"Maximum number of arguments is 2!", @"Maximum number of arguments is 2!")];
-		} else {
-			[resultingClauseLabel setStringValue:@"SELECT * FROM <table> WHERE"];
-			NSMutableString *c = [[NSMutableString alloc] init];
-			[c setString:[contentFilterTextView string]];
-			[c replaceOccurrencesOfRegex:@"(?<!\\\\)\\$BINARY" withString:@"[BINARY]"];
-			[c flushCachedRegexData];
-			[c replaceOccurrencesOfRegex:@"(?<!\\\\)(\\$\\{.*?\\})" withString:@"[arg]"];
-			[c flushCachedRegexData];
-			[c replaceOccurrencesOfRegex:@"(?<!\\\\)\\$CURRENT_FIELD" withString:@"<field>"];
-			[c flushCachedRegexData];
-			[resultingClauseContentLabel setStringValue:[NSString stringWithFormat:@"%@%@", ([suppressLeadingFiledPlaceholderCheckbox state] == NSOnState) ? @"" : @"<field> ", c]];
-			[c release];
-		}
-
-	}
-}
-#pragma mark -
-#pragma mark Menu validation
-
-/**
- * Menu item validation.
- */
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
-{
-
-	// Disable all if only GLOBAL is in the table
-	if([contentFilters count] < 2) return NO;
-
-	SEL action = [menuItem action];
-
-	if ( (action == @selector(duplicateContentFilter:)))
-	{
-		return ([contentFilterTableView numberOfSelectedRows] == 1);
-	}
-	else if ( (action == @selector(removeContentFilter:))	||
-		( action == @selector(exportFavorites:)))
-	{
-		return ([contentFilterTableView numberOfSelectedRows] > 0);
-	}
-
-	return YES;
-}
 
 #pragma mark -
 #pragma mark TableView drag & drop delegate methods
@@ -659,7 +580,6 @@
 /**
  * Return whether or not to accept the drop of the supplied rows.
  */
-
 - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation
 {
 
@@ -715,10 +635,152 @@
 }
 
 #pragma mark -
+#pragma mark Various Control delegate methods
+
+/**
+ * Detect if inline editing was done
+ */
+- (void)controlTextDidEndEditing:(NSNotification *)aNotification
+{
+	isTableCellEditing = NO;
+}
+
+/**
+ * Trap the escape overriding default behaviour and ending editing,
+ * only within the current row.
+ */
+- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command
+{
+	// Trap the escape key
+	if (  [[control window] methodForSelector:command] == [[control window] methodForSelector:@selector(cancelOperation:)] )
+	{
+
+		// Abort editing
+		[control abortEditing];
+		isTableCellEditing = NO;
+		// Reset name input text field
+		if([contentFilterTableView selectedRow] > -1)
+			[contentFilterNameTextField setStringValue:
+				[[contentFilters objectAtIndex:[contentFilterTableView selectedRow]] objectForKey:@"MenuLabel"]];
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Changes in the name text field will be saved in data source directly
+ * to update the table view accordingly. If filter name is changed via inline editing
+ * in the tableView update name text field accordingly and check for empty names
+ */
+- (void)controlTextDidChange:(NSNotification *)notification
+{
+
+	// Do nothing if no filter is selected
+	if([contentFilterTableView numberOfSelectedRows] < 1) return;
+
+	id object = [notification object];
+
+	if(object == contentFilterNameTextField) {
+		if([[contentFilterNameTextField stringValue] length]) {
+			[[contentFilters objectAtIndex:[contentFilterTableView selectedRow]] setObject:[contentFilterNameTextField stringValue] forKey:@"MenuLabel"];
+			[contentFilterTableView reloadData];
+		} else {
+			NSBeep();
+			[[contentFilters objectAtIndex:[contentFilterTableView selectedRow]] setObject:SP_NAME_REQUIRED_PLACEHOLDER_STRING forKey:@"MenuLabel"];
+			[contentFilterNameTextField setStringValue:SP_NAME_REQUIRED_PLACEHOLDER_STRING];
+			[contentFilterNameTextField selectText:nil];
+		}
+	}
+	else if (object == contentFilterTableView) {
+		NSTextView *editor = [[notification userInfo] objectForKey:@"NSFieldEditor"];
+		NSString *newName = [[editor textStorage] string];
+		if([newName length]) {
+			[contentFilterNameTextField setStringValue:newName];
+		} else {
+			NSBeep();
+			[editor insertText:SP_NAME_REQUIRED_PLACEHOLDER_STRING];
+			[editor setSelectedRange:NSMakeRange(0,[SP_NAME_REQUIRED_PLACEHOLDER_STRING length])];
+			[contentFilterNameTextField setStringValue:SP_NAME_REQUIRED_PLACEHOLDER_STRING];
+		}
+	}
+
+}
+
+/**
+ * Parse clause and update labels accordingly
+ */
+- (void)textViewDidChangeSelection:(NSNotification *)notification
+{
+	// Do nothing if no filter is selected
+	if([contentFilterTableView numberOfSelectedRows] < 1) return;
+
+	id object = [notification object];
+
+	if(object == contentFilterTextView) {
+		[insertPlaceholderButton setEnabled:([[contentFilterTextView string] length])];
+		[resultingClauseLabel setHidden:(![[contentFilterTextView string] length])];
+		[resultingClauseContentLabel setHidden:(![[contentFilterTextView string] length])];
+		[numberOfArgsLabel setHidden:(![[contentFilterTextView string] length])];
+
+		NSUInteger numOfArgs = [[[contentFilterTextView string] componentsMatchedByRegex:@"(?<!\\\\)(\\$\\{.*?\\})"] count];
+		[numberOfArgsLabel setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Number of arguments: %lu", @"Number of arguments: %lu"), (unsigned long)numOfArgs]];
+
+		[contentFilterConjunctionTextField setHidden:(numOfArgs < 2)];
+		[contentFilterConjunctionLabel setHidden:(numOfArgs < 2)];
+
+		if(numOfArgs > 2) {
+			[resultingClauseLabel setStringValue:NSLocalizedString(@"Error", @"error")];
+			[resultingClauseContentLabel setStringValue:NSLocalizedString(@"Maximum number of arguments is 2!", @"Maximum number of arguments is 2!")];
+		} else {
+			[resultingClauseLabel setStringValue:@"SELECT * FROM <table> WHERE"];
+			NSMutableString *c = [[NSMutableString alloc] init];
+			[c setString:[contentFilterTextView string]];
+			[c replaceOccurrencesOfRegex:@"(?<!\\\\)\\$BINARY" withString:@"[BINARY]"];
+			[c flushCachedRegexData];
+			[c replaceOccurrencesOfRegex:@"(?<!\\\\)(\\$\\{.*?\\})" withString:@"[arg]"];
+			[c flushCachedRegexData];
+			[c replaceOccurrencesOfRegex:@"(?<!\\\\)\\$CURRENT_FIELD" withString:@"<field>"];
+			[c flushCachedRegexData];
+			[resultingClauseContentLabel setStringValue:[NSString stringWithFormat:@"%@%@", ([suppressLeadingFiledPlaceholderCheckbox state] == NSOnState) ? @"" : @"<field> ", c]];
+			[c release];
+		}
+
+	}
+}
+#pragma mark -
+#pragma mark Menu validation
+
+/**
+ * Menu item validation.
+ */
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+
+	// Disable all if only GLOBAL is in the table
+	if([contentFilters count] < 2) return NO;
+
+	SEL action = [menuItem action];
+
+	if ( (action == @selector(duplicateContentFilter:)))
+	{
+		return ([contentFilterTableView numberOfSelectedRows] == 1);
+	}
+	else if ( (action == @selector(removeContentFilter:))	||
+		( action == @selector(exportFavorites:)))
+	{
+		return ([contentFilterTableView numberOfSelectedRows] > 0);
+	}
+
+	return YES;
+}
+
+#pragma mark -
 #pragma mark Other
 
 /**
- * Sheet did end method
+ * Sheet did end method for removing content filters
  */
 - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo
 {
@@ -873,12 +935,4 @@
 	}
 }
 
-- (void)_initWithNoSelection
-{
-	[contentFilterTableView selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO];
-	[[contentFilterNameTextField cell] setPlaceholderString:SP_NO_SELECTION_PLACEHOLDER_STRING];
-	[contentFilterNameTextField setStringValue:@""];
-	[contentFilterTextView setString:@""];
-}
-
 @end
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index 122822a3..e79b2c36 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -698,8 +698,17 @@
 	// Notify listenters that the query has finished
 	[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance];
 
-	// Trigger a full reload if required
-	if (fullTableReloadRequired) [self reloadTable:self];
+	if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) {
+		if(filterString)
+			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil,
+						  [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded presumably due to used filter clause. \n\nMySQL said: %@", @"message of panel when loading of table failed and presumably due to used filter argument"), [mySQLConnection getLastErrorMessage]]);
+		else
+			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil,
+						  [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded.\n\nMySQL said: %@", @"message of panel when loading of table failed"), [mySQLConnection getLastErrorMessage]]);
+	} else {
+		// Trigger a full reload if required
+		if (fullTableReloadRequired) [self reloadTable:self];
+	}
 }
 
 /**