Filter expression literal handling fixes