Call query-map later, use keywords longer
Merge pull request #65 from atroche/use-keywords-when-making-request

Call query-map later, use keywords longer