fix issues with findall query and locked resource metadata objects