seems to be working
Merge branch 'feature/session-resource'
search function fixed