Start to fix "query-param-like" expressions rendering