performance improvements: fix search on whole objects