refactor park subsquery