added more query options