core file changes to allow flexible searching