Add Symfony 2.2 compatibility
Fix basicSearchTerms where no queries are passed in