CompareStoredQueries: add curly brackets on if
Remove MatchableObject
Revert MatchableObject from MatchableDataTable