Try to improve performance of the search such as 'Programacao Orientada' and 'Sistemas Operacionais I'
Merge branch 'hotfix/0.5.10'