adding stricter query