Replacing logic for if/else for responses

Signed-off-by: Predrag Kanazir <predrag@arraystudio.com>
improvements for selector

Signed-off-by: Predrag Kanazir <predrag@arraystudio.com>