Search module fixed