Added search for subscribed user and guest user
Merged