Made Changes for a Search & sort