Fixes in resolving of query parameter