Update till 7th July, changed models + search by org, search by event