Fixed issues with new improved field level search
Preserve id order