removed some high priority bugs found by findbugs in the FlatQueryBuilder