Added new subscription support
Updated search to match index