[DO NOT REVIEW] Fixes #6451,BZ1114757 - Cleaning up org search options methods