Moved buff checks to target selector
minor performance changes