added exceptions to find queries