limit conversion to metabolites and reorder where
Merge pull request #1 from ariutta/master

Rename construct queries and limit conversion construct query