Minor updates to filter and chart settings data handlers