added some configuration validation, modified user/incident query