Moved the source filtering inside parse_source_model_smart