Search by incident id and flash message support added