Fixed sliding issue & applied query constraint