Added maintenace mode locking
BUG: Fixed search for ELs
Merge branch 'develop'