Merge courses-search into develop