TODO: Handle empty query appropriately