Alerts search

The only relevant commits are 07b5650 and 31e8b84