fix song search, add correct song model, add song adding