Adding more query options