Cleaned up QueryBuilder so that it handles searches itself.
Added (optional) concept ids to ESA