fixed position filter by ID; closes#1354
fixed location filter to use ID and removed All Locations option
removed position nested json in users query string
merge conflicts
Merge branch '1354' into 1343