Error in the last fix

Error in the fix for ambigous filtering, used filter_key instead.
Added return_state color.