Moved F-expression name-to-expression resolving logic to Query