Support contains param in Find service

#696

Based on this branch
#732