Add support for query and NULL values in query string
Add current year and quarter when clicking on modal link