Move most queries to org.zeroirclog.SearchQuery