Added automatic querying of parameters when one is missing