Refactor filter get value
Move location stuff into advanced data