- removed lock query and use structured query instead