Shop filter fix & added loader