BZ-13215 using query params instead of route params
BZ-13215 beautify