#76 rearanging alkis search
Merge branch 'feature/76-alkis-search' into dev