undefined activity_compare which broke notifications (should be activity_match) and revamp xchan_query as abook is optional and need not be present - if it isn't there we still need the xchan, but if it is there we need to make sure that it belongs to whichever channel owns the post