Added install-by-query support.