Added search by skills, and minor other fixes