PLA-1198 speed up query and limited lock time to 10 seconds