add filtering for auto functionality