There are situations where InfoPath will not correctly suggest current() when selecting the main data source as a comparison in a filter on a secondary data source, but I've never heard of it removing them once added. Try to find a good set of steps that reproduce the problem and we'll investigate.
Patrick Halstead
Project Manager at Qdabra