added support for complex queries in persistence. missing tests
finished tests update for complex queries
propagated complex queries to analyzer