Fix analysis to be more consistent, filter out relations