Add wishId to returned list
Merge branch 'feature-wish' into develop