location sort and filter fixed