Dev lubis corrections

searchable layers will come in the next few hours, but please merge this one ASAP