Fix lock for select statements
Identified early call to super and apply lock.
Lock is now applied correctly to all select statements.